Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring the Zephyr HWinfo driver changes into NCS #1985

Merged
merged 5 commits into from
Aug 30, 2024

Conversation

kapi-no
Copy link
Contributor

@kapi-no kapi-no commented Aug 29, 2024

HWinfo depends on the nrfx v3.6.0 integration:

Combines commits from the following PRs:

… 3.6.0

New nrfx version contains support
for nRF54L20 Eng A and nRF9230 Eng B devices.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit 492a474)
@NordicBuilder
Copy link
Contributor

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@ab5cb2e zephyrproject-rtos/hal_nordic@d4030af zephyrproject-rtos/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

nika-nordic and others added 4 commits August 30, 2024 09:25
…for nrf54l15 enga

This option is no longer valid for nRF54L15 Eng A target.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit c0ede71)
…C_BYTE option

New option is used in RX FIFO flush workaround
performed by the nrfx_uarte driver.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit 443276e)
…out cfg

This is needed to avoid warnings about uninitialized
structure member, which was added in nrfx 3.6.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit 4312805)
…from device addr

In some ICs (including nRF54H20) the DEVICEID register is not part of
FICR, and thus it is not accessible to applications. Use instead the
device address, along with a couple of bytes from ER and IR, to
generated a unique device id.

At the same time update the pointer to the hal_nordic repo to pull in
zephyrproject-rtos/hal_nordic#196.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit ebd31d3)
@kapi-no kapi-no force-pushed the ncs_hwinfo_nrf54h20_adaptation branch from 3806268 to 7dd6674 Compare August 30, 2024 07:26
@kapi-no
Copy link
Contributor Author

kapi-no commented Aug 30, 2024

Fixed the cherry-picked commit history

@carlescufi carlescufi merged commit 425e40b into nrfconnect:main Aug 30, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants